Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Jul 2010 10:16:08 +0000 (10:16 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Jul 2010 10:16:08 +0000 (10:16 +0000)

Trivial merge